deprecate GdkDestroyNotify.

2008-06-18  Michael Natterer  <mitch@imendio.com>

	* gdk/gdk.h: deprecate GdkDestroyNotify.

	* gdk/gdkevents.c
	* gdk/gdktypes.h
	* gdk/x11/gdkevents-x11.c
	* gtk/gtkmain.c: s/GdkDestroyNotify/GDestroyNotify/g.

svn path=/trunk/; revision=20449

diff --git a/ChangeLog b/ChangeLog
index 7ba0c212678692ce99e8f2026e5fc8bf245e096d..2932e65f405243b1bbee80480237a1ee953bd252 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-06-18  Michael Natterer  <mitch@imendio.com>
+
+       * gdk/gdk.h: deprecate GdkDestroyNotify.
+
+       * gdk/gdkevents.c
+       * gdk/gdktypes.h
+       * gdk/x11/gdkevents-x11.c
+       * gtk/gtkmain.c: s/GdkDestroyNotify/GDestroyNotify/g.
+
 2008-06-18  Michael Natterer  <mitch@imendio.com>
 
        * gtk/gtktypeutils.h: deprecate GtkDestroyNotify.

diff --git a/gdk/gdk.h b/gdk/gdk.h
index b81d48839ad7e3b5f2b30ee7f5128ce95bb32e17..008713d2acca7024d506085a8028575bccaa6ec3 100644 (file)
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -102,7 +102,7 @@ gint gdk_input_add_full       (gint              source,
                           GdkInputCondition condition,
                           GdkInputFunction  function,
                           gpointer          data,
-                          GdkDestroyNotify  destroy);
+                          GDestroyNotify    destroy);
 #endif /* !GDK_DISABLE_DEPRECATED || GTK_COMPILATION */
 #ifndef GDK_DISABLE_DEPRECATED
 gint gdk_input_add       (gint              source,

diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index bc0e62a42d6f8dd949772eebef6aa0938e0b8bb1..adc6a1b84c01a5fb79f0b99e64c869b75722ad9b 100644 (file)
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -37,7 +37,7 @@ struct _GdkIOClosure
 {
   GdkInputFunction function;
   GdkInputCondition condition;
-  GdkDestroyNotify notify;
+  GDestroyNotify notify;
   gpointer data;
 };
 
@@ -1020,7 +1020,7 @@ gdk_input_add_full (gint        source,
                    GdkInputCondition condition,
                    GdkInputFunction  function,
                    gpointer          data,
-                   GdkDestroyNotify  destroy)
+                   GDestroyNotify    destroy)
 {
   guint result;
   GdkIOClosure *closure = g_new (GdkIOClosure, 1);

diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
index 06a7aa06274ebae59ade70ee27d0f56e97c85efe..ac8e4431d74883e8e579c49156a4d43a7942f197 100644 (file)
--- a/gdk/gdktypes.h
+++ b/gdk/gdktypes.h
@@ -179,8 +179,12 @@ typedef void (*GdkInputFunction) (gpointer     data,
                                  gint              source,
                                  GdkInputCondition condition);
 
+#ifndef GDK_DISABLE_DEPRECATED
+
 typedef void (*GdkDestroyNotify) (gpointer data);
 
+#endif /* GDK_DISABLE_DEPRECATED */
+
 struct _GdkPoint
 {
   gint x;

diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
index f43a02ea6221ec698b749580a3c6b8c2536c1c62..500b0b444e4b0800c3d55bbcef4d80208ac10b4e 100644 (file)
--- a/gdk/x11/gdkevents-x11.c
+++ b/gdk/x11/gdkevents-x11.c
@@ -72,7 +72,7 @@ struct _GdkIOClosure
 {
   GdkInputFunction function;
   GdkInputCondition condition;
-  GdkDestroyNotify notify;
+  GDestroyNotify notify;
   gpointer data;
 };
 

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index e1c37b67087c1becfdc0036bea0cdccb302c7260..6065a3f27ceb0063dbd96c4972cb4c90e8741577 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -2093,7 +2093,7 @@ gtk_input_add_full (gint          source,
                                 condition,
                                 (GdkInputFunction) gtk_invoke_input,
                                 closure,
-                                (GdkDestroyNotify) gtk_destroy_closure);
+                                (GDestroyNotify) gtk_destroy_closure);
     }
   else
     return gdk_input_add_full (source, condition, function, data, destroy);